Conditionalize units which require a boot disk by bgilbert · Pull Request #102 · coreos/ignition-dracut

bgilbert · 2019-09-05T06:43:26Z

On live PXE or ISO boots, skip units which operate on a boot disk.

Part of coreos/fedora-coreos-config#155.

bgilbert · 2019-09-10T23:30:23Z

Updated to fix ignition-diskful.target failing to pull in any units.

dustymabe

initial comments. will add some more tomorrow after testing artifacts

dustymabe · 2019-09-13T00:56:04Z

dracut/30ignition/ignition-diskful.target

+
+# Make sure if any ExecStart= fail, the boot fails. This normally would
+# already be guaranteed by `initrd.target` failing, but that doesn't seem to be
+# enough: https://bugzilla.redhat.com/show_bug.cgi?id=1696796


this looks to be copied from igniton-complete.target. According to the BZ the bug only affects f29 so maybe we can drop this now? cc @jlebon as this was first added in 549002e

I tried dropping the stanza from ignition-complete.target, and that causes systemd to loop in the initrd if ignition-files fails. With the stanza, it properly fails the boot. So, still needed.

On the other hand, if a dependency of ignition-diskful.target fails, systemd doesn't fail the boot with or without this stanza. 🙁

Yeah, I recalled this working on f30. I guess systemd might've regressed on git master too? If that's the case, we should be able to file an issue upstream for this where it'll hopefully get more exposure. (The only reason I made it an RHBZ was that upstream only wants bugs that reproduce against N and N-1).

would definitely be nice if we could get this fixed in at least f31

dustymabe · 2019-09-13T03:43:41Z

dracut/30ignition/ignition-diskful.target

@@ -0,0 +1,16 @@
+# This target contains Ignition units that should only run when we have


i've been trying to think of a better name than ignition-diskful.target but I haven't come up with any clear winners. ignition-withbootdisk.target was an initial thought but meh..

diskful being the opposite of diskless 🙂

Maybe something like ignition-bootloader.target, diskful doesn't quite convey the entire context that it's specifically for units targeting the boot disk.

I'd also be fine leaving it as is given the comments in the target.

I agree that it doesn't. Those units aren't really related to the bootloader, though.

others possibles: ignition-withharddisk.target ignition-bootedfromdisk.target blah blah blah :)

diskful being the opposite of diskless slightly_smiling_face

You know this might sound dumb, but putting that exact word in the description of this target unit file might actually help it click for people.

i.e. when we're not running diskless from a live image out of RAM

You know this might sound dumb, but putting that exact word in the description of this target unit file might actually help it click for people.

Good point. Updated.

arithx

Overall LGTM

arithx · 2019-09-13T04:46:37Z

dracut/30ignition/ignition-diskful.target

@@ -0,0 +1,16 @@
+# This target contains Ignition units that should only run when we have


Maybe something like ignition-bootloader.target, diskful doesn't quite convey the entire context that it's specifically for units targeting the boot disk.

I'd also be fine leaving it as is given the comments in the target.

Add ignition-diskful.target, containing units that expect a writable boot disk. Enable it from the generator unless there's a command "is-live-image" which returns 0.

In live boots there's no /boot partition with a flag file to remove.

dustymabe

LGTM - I've written down this item as a followup:

investigate need for https://bugzilla.redhat.com/show_bug.cgi?id=1696796 in ignition-diskful.target and ignition-complete.target - report issue upstream if not really fixed

cgwalters

LGTM

cgwalters · 2019-09-16T17:38:38Z

dracut/30ignition/module-setup.sh

    install_ignition_unit ignition-files.service
-    install_ignition_unit ignition-remount-sysroot.service
+
+    # units only started when we have a boot disk


Wonder if it'd be cleaner to have the units test ConditionPathExists=!/run/ostree-live instead? I don't have a strong opinion though.

All of these except ignition-remount-sysroot.service pull in device dependencies, so they have to be enabled via generator. Conditions are only evaluated after dependencies are pulled in.

dracut/30ignition: localize some variables

9c60150

bgilbert mentioned this pull request Sep 9, 2019

Initial support for live PXE and ISO images coreos/fedora-coreos-config#155

Merged

dustymabe reviewed Sep 13, 2019

View reviewed changes

arithx reviewed Sep 13, 2019

View reviewed changes

bgilbert added 2 commits September 16, 2019 02:37

30ignition: conditionally enable units requiring a boot disk

6ea3fab

Add ignition-diskful.target, containing units that expect a writable boot disk. Enable it from the generator unless there's a command "is-live-image" which returns 0.

systemd: don't try to mark live boots complete

eb48c18

In live boots there's no /boot partition with a flag file to remove.

dustymabe approved these changes Sep 16, 2019

View reviewed changes

cgwalters approved these changes Sep 16, 2019

View reviewed changes

bgilbert merged commit cbac371 into coreos:master Sep 16, 2019

bgilbert deleted the live branch September 16, 2019 19:48

		@@ -0,0 +1,16 @@
		# This target contains Ignition units that should only run when we have

Conversation

bgilbert commented Sep 5, 2019

Uh oh!

bgilbert commented Sep 10, 2019

Uh oh!

dustymabe left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arithx left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dustymabe left a comment

Choose a reason for hiding this comment

Uh oh!

cgwalters left a comment

Choose a reason for hiding this comment

Uh oh!

cgwalters Sep 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cgwalters Sep 16, 2019 •

edited

Loading